Auto merge of #3598 - pornel:proxyconf, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 27 Jan 2017 03:56:09 +0000 (03:56 +0000)
committerbors <bors@rust-lang.org>
Fri, 27 Jan 2017 03:56:09 +0000 (03:56 +0000)
commit19dc757120ed945fd591bf905bdf62540a3ffc74
treeeb55e15f47481c6fba8b65f2ba8f1c26651c5e17
parent2d5a584c699729bff7892a0c401aedf28a88e4be
parent1760e2e8fffecf26bd0d079a0cd7b41823dffccb
Auto merge of #3598 - pornel:proxyconf, r=alexcrichton

Example proxy config

#3596